Add patch to fix .test metadata

diff --git a/debian/changelog b/debian/changelog
index 3e720f6038776856b61af7baf30ef56e979aa540..a2ae01e1f8236ff7397dd1500f4890d563256382 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ gtk+4.0 (3.92.1-2) UNRELEASED; urgency=medium
     The build-time tests correctly set GTK_CSD=1 now.
   * Build installed-tests
     - Install them in gtk-4-examples for now to avoid the NEW queue
+    - d/p/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch:
+      Add patch to fix .test metadata
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 22:05:35 -0500
 

diff --git a/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch b/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch
new file mode 100644 (file)
index 0000000..40e140a
--- /dev/null
+++ b/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch
@@ -0,0 +1,52 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 14 Sep 2018 09:22:15 +0100
+Subject: reftests: Fix path to installed-tests in .test metadata
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ testsuite/reftests/reftests-dark.test.in | 2 +-
+ testsuite/reftests/reftests-hc.test.in   | 2 +-
+ testsuite/reftests/reftests-hci.test.in  | 2 +-
+ testsuite/reftests/reftests.test.in      | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in
+index 9ff9e21..ab0e2fb 100644
+--- a/testsuite/reftests/reftests-dark.test.in
++++ b/testsuite/reftests/reftests-dark.test.in
+@@ -1,4 +1,4 @@
+ [Test]
+-Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
++Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+ Type=session-exclusive
+ Output=TAP
+diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in
+index ea3ae9e..9d6cb56 100644
+--- a/testsuite/reftests/reftests-hc.test.in
++++ b/testsuite/reftests/reftests-hc.test.in
+@@ -1,4 +1,4 @@
+ [Test]
+-Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
++Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+ Type=session-exclusive
+ Output=TAP
+diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in
+index d08bb98..6ea0b1a 100644
+--- a/testsuite/reftests/reftests-hci.test.in
++++ b/testsuite/reftests/reftests-hci.test.in
+@@ -1,4 +1,4 @@
+ [Test]
+-Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
++Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+ Type=session-exclusive
+ Output=TAP
+diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
+index 6b8a42f..9eb1864 100644
+--- a/testsuite/reftests/reftests.test.in
++++ b/testsuite/reftests/reftests.test.in
+@@ -1,4 +1,4 @@
+ [Test]
+-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
++Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+ Type=session-exclusive
+ Output=TAP

diff --git a/debian/patches/series b/debian/patches/series
index 4eb58e1dc6eec3d3b0486eab9e0798fc0e8af632..8ec90b19f0ca4c7cbb86db63e341cd9292c81261 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reftest-known-fail.patch
+reftests-Fix-path-to-installed-tests-in-.test-metadata.patch